Introduce NVS_LOOKUP_CACHE_FOR_SETTINGS Kconfig option that
enables a dedicated hash function for the NVS lookup cache
that takes advantage of the NVS ID allocation scheme used
by the NVS settings backend. As such, this option should
only be used if an application uses NVS via the settings
layer.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
(cherry picked from commit c7c73c1)

This action will automatically manage a PR to sdk-nrf
once a PR to sdk-zephyr is created.

This includes:
 - Creating an initial PR
 - Updating and (optionally) rebase it once the PR
   to sdk-nrf is merged.

The action can be disabled by adding the string
"manifest-pr-skip" to the title or body of the PR.

This will simplify cherry-picking changes from upstream
zephyr.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit a0d974e)

The Thingy:53 enabled MCUboot and external flash by default.
Therefore, it should also enable drivers for its external
flash by default.

Signed-off-by: Sigurd Hellesvik <sigurd.hellesvik@nordicsemi.no>
(cherry picked from commit 08d091e)

Add overlay for nrf54l15dk to enable eGPIO tests.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 8b6614f)

-This commit is a [nrf noup] because it removes configuration options
 for cryptographic algortihms available in Mbed TLS but which is not
 actively supported in nRF Connect SDK.
 The list of algorithms removed:
 - AES CFB - Cipher Feedback block cipher
 - AES OFB - Output Feedback block cipher
 - FFDH
 - RIPEMD160
 - Aria
 - Camellia
 - DES

 The removal of these algorithms is based both on a wish to remove
 weaker cryptography and unsupported features in the products we have
 today.

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit aa49bd2)

-This is a [nrf noup] as this the upstream version of PSA crypto configs
 is generated by tooling, and there is no mechanisms to qualify
 that dependent configurations are enabled (by depends or select).
-This adds dependency-mapping between configurations in the Kconfigs
 added for PSA crypto in upstream.
-Selecting CHACHA20 key type if PSA_WANT_ALG_STREAM_CIPHER is
 enabled

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit e9b99eb)

Although ZVFS is experimental, the warning is annoying the matter team.
Therefore, remove the experimental selection.

This may be reverted once upstream unselects experimental.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 8cb0524)

Make sure Wi-Fi driver is enabled in networking samples supporting Wi-Fi
when sysbuild is used.
For shields we cannot automate this, as sysbuild doesn't recognize
shields, so, Wi-Fi has to be explicitly enabled, this is done for
twister in Wi-Fi sample.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 13946e4)

…nload

-We handle legacy Crypto API support specially (favoring PSA crypto)
 the tests here require MD interface to build, which needs the config
 MBEDTLS_LEGACY_CRYPTO_C to be enable to get access to

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit dc583ba)

-This adds crypto support for ipv6 tests by enabling
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
(cherry picked from commit d04c007)

Add support for sysbuild 54h20 building
added nrf54h20 cpurad configuration to hci_ipc sample.

Signed-off-by: Aytürk Düzen <ayturk.duzen@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 3765002)

Disable processing of extended ADV packets by mesh scanner.
This is done to prevent loss of scan time due to reception
of pointer packets while scanning for mesh packets.

Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
(cherry picked from commit 6a6f1e4)

This is a long-term noup patch because crypto driver support is
NCS-only for both cryptocell and CRACEN.

Set HAS_HW_NRF_CC3XX to be defined in NS build when cryptocell
is accessed through the PSA API.
We need to know which CC3XX features are available.

Set PSA as the entropy source for 54L.

PSA is the only NCS-supported interface to CRACEN.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 2cd9fbb)

Add a custom section in the linker which should always
be placed in the top of RAM. This will be used by the
KMU to push keys into it. Since when you provision a key
into the KMU you need to set specific a memory location
for the PUSH operation we need to keep this memory location
static across images/dfus.

The linker script inclusion which places the KMU reserved
buffer on the top of RAM doesn't work for non-XIP builds.
The Zephyr linker script will firstly load the code for
an non-XIP build in RAM and then include this KMU related
linker script which results in an unpredictable placement
of the KMU reserved area and a failed build.

In order to support non-XIP builds the linker file is not
included and the a DTS reserved-memory entry should be used.

To limit the scope, the DTS reserved memory region
is currently only supported for non-XIP builds.

This is a noup since the KMU is not supported upstream.

Ref: NCSDK-25121

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>
(cherry picked from commit fbc2024)

Fixes some issues with samples/tests by adding configuration
files to satisfy TF-M requirements

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 20d3749)

Added ncs-specific modules to nrfx_config_reserved_resources.
The modules are:
- mpsl
- nrfe

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Co-authored-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
Signed-off-by: Aleksandar Stanoev <aleksandar.stanoev@nordicsemi.no>
Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
(cherry picked from commit 5566637)

…targets.

Mesh currently works with trusted storage on real targets. Until secure
storage is supported by default disable it.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit 35fcd6e)

…Cracen driver on nRF54H20

A larger stack is needed to accomodate the Cracen driver.

Signed-off-by: Gordon Klaus <gordon.klaus@nordicsemi.no>
(cherry picked from commit 4797b5f)

This commit brings back modifications from these reverted commits:
- f68b2ed
- e606246
slightly adjusted so that the EXMIF peripheral is still by default
handled by the mspi_dw driver, and in cases where this driver cannot
be used because something still does not work correctly, one can
switch to the old solution based on the tweaked spi_dw driver.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
(cherry picked from commit 5878b1b)

Update Kconfig options for qualification:
 - Remove experimental on qualified feature.
 - Add experimental on unqualified feature.
 - BT_L2CAP_ECRED is not marked as experimental upstream and we qualify it
   downstream.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Herman Berget <herman.berget@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
(cherry picked from commit f23942a)

The PSA is a cryptographically secure random number generator.

It will be enabled by default, eventually,  For now, enable it manually.

Signed-off-by: Gordon Klaus <gordon.klaus@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
(cherry picked from commit 60e3e91)

Necessary changes for NCS CI.

- Add a Jenkinsfile
- Add a commit-tags workflow: This enables sauce tag checking in sdk-zephyr
- compliance.yml: Disable check for merge commits, since we have upmerges
downstream. Also, since in the code we refer to Kconfig symbols that are defined
in the sdk-nrf repository, the Kconfig checks ((SysBuild)Kconfig,
(SysBuild)KconfigBasic and (SysBuild)KconfigBasicNoModules) will not pass so
exclude them. Also, disable any maintainers-related checks
- scripts/gitlint: Extend the max commit line lengths for Gitlint to account
for sauce tags
- Adapt to the changes in:
nrfconnect/action-commit-tags#4

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 7de0c84)

Adds symbols used in NCS to the sysbuild Kconfig allow list

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit 666ffc1)

Add boards/nordic/**/* to the CI-boot-test scope and remove SUIT labels.

Signed-off-by: Robert Stypa <robert.stypa@nordicsemi.no>
(cherry picked from commit f2b86e0)

Fixed board page in zephyr.

Signed-off-by: Richa Pandey <richa.pandey@nordicsemi.no>
(cherry picked from commit 3b01d33)

Enable the `empty_app_core` image when building for `cpurad`.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit bc0141c)

The xiao_ble boards ship with a bootloader requiring an app offset of 0x27000.
The upstream board defines this via DT partitions, which will not be used if
partition manager is enabled.
Add a static partition configuration to allow binaries built for this board
to work out-of-the-box in NCS, and match the behavior with sysbuild disabled.

Signed-off-by: Aleksandar Stanoev <aleksandar.stanoev@nordicsemi.no>
(cherry picked from commit 0128a91)

Ref: NCSDK-34052

Signed-off-by: Krzysztof Szromek <krzysztof.szromek@nordicsemi.no>
(cherry picked from commit 23af03a)

Add support for nRF91x by providing overlay configuration file.

Signed-off-by: Juha Ylinen <juha.ylinen@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
(cherry picked from commit 3f93b67)

… non-erase devices

The wr_chunk function had a fast path for devices without explicit erase
(e.g. nRF54L RRAM) that wrote chunk data directly without aligning the
offset or size to the flash write block size. On RRAM with
write-block-size=16, this caused -EINVAL from the flash driver for every
chunk write since chunk_size (161) and most chunk offsets are not
16-byte aligned.

The failed writes caused the BLOB server to never mark chunks as
received, resulting in block_status_rsp always reporting all chunks
missing. This led to infinite retransmission of block 0 and eventual
DFU timeout.

Fix by using a read-modify-write approach for non-erase devices:
read existing data at the aligned boundaries, overlay the chunk data,
and write back the full aligned buffer. This satisfies the driver's
alignment requirements while preserving neighboring bytes.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
(cherry picked from commit a9ad258)

Unit address and first address now match.

Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>

(cherry picked from commit f3ad737)

…or flash driver

Test SPI NOR flash driver ability to hande the 'supply-gpios' property.

Signed-off-by: Bartosz Miller <bartosz.miller@nordicsemi.no>
(cherry picked from commit 08250dc)

This reverts commit 206c0ef.

Changes introduced by this commit to be moved to sdk-nrf.

Signed-off-by: Anton Zyma <anton.zyma@nordicsemi.no>

When TF-m is enabled on 54L the ROM_START_OFFSET should
not be overridden, even if MCUboot is enabled.

Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
(cherry picked from commit 46d1934)

Adds an override to force this Kconfig to 0 when partition manager
is enabled

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit cf7c4d3)

…ooth version 6.3

Add definition and decoding for version 6.3.

Relates to zephyrproject-rtos/zephyr#109050

Upstream PR #: 109050

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>

…family

Add handling of the nrf92 chip family to a conditional statement.
The nrf92 family is similar to the nrf54h20 chip.

Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
(cherry picked from commit 9702da9)

…nrf7120

Enable flash negative test for nrf7120.
Enable sample soc_flash_nrf for nrf7120.

Signed-off-by: Travis Lam <travis.lam@nordicsemi.no>
(cherry picked from commit c171ef8)

… modes

When FLASH_USES_MAPPED_PARTITION is enabled, Kconfig skips
FLASH_LOAD_OFFSET and FLASH_LOAD_SIZE. However, the linker scripts
only used the DT-based ROM_ADDR/ROM_SIZE path when both
FLASH_USES_MAPPED_PARTITION and CONFIG_XIP were set. For non-XIP
modes (e.g. MCUboot ram_load), the code fell through to the else
branch relying on the missing configs, causing ROM_SIZE to underflow
to 0xFFFFFFFFFFFFFFFF and a linker overflow error.

Fix by checking only FLASH_USES_MAPPED_PARTITION for ROM_SIZE, and
handling ROM_ADDR separately for XIP (DT address) vs non-XIP
(RAM_ADDR).

Signed-off-by: Albort Xue <yao.xue@nxp.com>
(cherry picked from commit 1cf0cc2)

The current default stack space for net_mgmt thread is 800 bytes
and it can be too small in some boards like nrf5340dk/nrf5340/cpuapp
like shown in this log. Increase the stack to 1024 so that we avoid
updating the value in near future.

Running TESTSUITE dhcpv6_tests
===================================================================
START - test_confirm_exchange_after_iface_down
E: ***** USAGE FAULT *****
E:   Stack overflow (context area not valid)
E: r0/a1:  0x00010fc4  r1/a2:  0x01000000  r2/a3:  0x00000020
E: r3/a4:  0x200022a8 r12/ip:  0x00000020 r14/lr:  0x20003088
E:  xpsr:  0x00011400
E: Faulting instruction address (r15/pc): 0x200030b8
E: >>> ZEPHYR FATAL ERROR 2: Stack overflow on CPU 0
E: Current thread: 0x20000d88 (net_mgmt)
E: Halting system

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 46f59b0)
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

…et_defaults

The previous documentation was confusing. This adds much clearer
language.

Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no>

(cherry picked from commit 237dcf2)

… for CTRLSEL on P5

Add support for CTRLSEL periphconf entries on nRF92 seriers P5 for
spi120 and uart120.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>

Upstream PR #: 108976